From 0d360a2af9b306d1279a20eaa9e3c2001b113754 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Jul 2004 06:22:26 +0000 Subject: [PATCH] Fix the positioning of the popup. Fri Jul 30 02:21:41 2004 Matthias Clasen * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Fix the positioning of the popup. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkentrycompletion.c | 6 ++++-- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 661e047d92..618eba713a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 30 02:21:41 2004 Matthias Clasen + + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): + Fix the positioning of the popup. + Fri Jul 30 00:56:31 2004 Matthias Clasen * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 661e047d92..618eba713a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jul 30 02:21:41 2004 Matthias Clasen + + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): + Fix the positioning of the popup. + Fri Jul 30 00:56:31 2004 Matthias Clasen * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 661e047d92..618eba713a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jul 30 02:21:41 2004 Matthias Clasen + + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): + Fix the positioning of the popup. + Fri Jul 30 00:56:31 2004 Matthias Clasen * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 661e047d92..618eba713a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jul 30 02:21:41 2004 Matthias Clasen + + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): + Fix the positioning of the popup. + Fri Jul 30 00:56:31 2004 Matthias Clasen * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index c093acfb9c..f36d510925 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1267,6 +1267,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) gint monitor_num; GdkRectangle monitor; GtkRequisition popup_req; + GtkRequisition entry_req; GtkTreePath *path; gboolean above; gint width; @@ -1318,15 +1319,16 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) gtk_widget_hide (completion->priv->action_view); gtk_widget_size_request (completion->priv->popup_window, &popup_req); + gtk_widget_size_request (completion->priv->entry, &entry_req); if (x < monitor.x) x = monitor.x; else if (x + popup_req.width > monitor.x + monitor.width) x = monitor.x + monitor.width - popup_req.width; - if (y + height + popup_req.height <= monitor.y + monitor.height) + if (y + entry_req.height + popup_req.height <= monitor.y + monitor.height) { - y += height; + y += entry_req.height; above = FALSE; } else -- 2.30.2